Removed unneccesary arguments from callbacks