removed more commented code