Some cleanup in the makefiles