remove unneccessary event dispatcher