Fixed use of FireRegisteredEvent and Register
Removed legacy code