took out more debugging stuff