remove obsolete commented out code and modifiers
7 files changed