remove logging, remove commented out code