removed commented out code, hangers on