develop clean up; remove commented code