Cleanup - remove dead/commented code