Removed all the old commented code