Remove unneeded code.
Change the name of the event registartion machine name.