Pulled out some commented code that is no longer necessary