Cleaning up code commented out.