Cleaned up Api notification events and className.