Remove unused and update other m4 files.