Removed commented and unused code.