just clean up comment out areas