cleanup, remove commented code.