Monotone: clean up