Removed some unneeded callbacks