Code cleanup
Re-generated the Makefiles