Add a `mock_clean` configuration option
Add some extra debugging output