remove commented code, cleanup