Code cleanup

Removed some unused code