cleaned up a bunch of stuff esp makefiles