Cleanup actions should be masked (fixes #144)