Clean up and deletion of old code
cleaned up code
Removed Dirty Code