Removing lots of old commented code