Removing code commented out