Removing callback logic