removed additional bad callbacks