Deleted a lot of old commented code