consolidate or remove commented code