Clean up

Removed unused code.