Removals and cleanup

See commit messages.