Cleanup

Removing dead/unneeded code