Remvoe unused, add and update m4 files as necessary.