Remove some unneccesary code and files