cleanup: remove commented code