minor refactoring, marked areas that need work
removed unnecessary includes and libdirs