got rid of some commented code that was unnecessary