Final changes

Removed some more unused code.