Took out PM and registration of events