cleaning up a lot of unnecessary things
adding two missing source files