Too lazy to figure out what im commiting
lots of cleanup