more commented out code removed