Cleanup of the makefiles