Removing code previously commented out.