Clean up Notify classes