TRUNK-3851 - removing some commented code