removed some unncessary commented out code