Code cleanup

Removed unused stuff.