remove commented code and logging