Cleanup

Removed some unused code