Cleanup

Removed unused code.