removed unnecessary callbacks