Clean up monitor class