remove commented out stuff [#1365]