Minor refactoring

Added some minor refactor, cleanup and remove subscribed event.