remove type code and restruct event classes