Monir cleanup