cleanup of commented out sections