Took out call-backs that do nothing