Remove some left-over stuff

Authored by dreixel.