removed commented code, and unjustified moan;