removed pointless comments and unused code