More cleanup, updated mutter