Remove unused crap. CLean up solution a lil bit
More cleanup