commented out some code that appears to not be needed