Removing commented/old code