removed unneeded event handling from factories.