cleaned up

took out a lot of lines that were unneccesary, possible wiring class in
future