do not commit commented code. Dead code should be deleted.

Also, check logic for this method - As it is, it's behaving differently.