removed more commented out code