Cleanup

Removing redundant code