Cleanup

Cleared out some unused code, better overview.