Remove some unneccesary stuff
Remove some old stuff