Cleanup the rest of the Makefile.am's