Misc small changes

Mainly removing unused stuff.