Removed all old commented code