Removed unused code

Cleanup