Removing old commented code