removing unnecessary,already commented-out, code