cleanup and update makefiles