rid of commented out and unused code