some cleanup in the makefiles