Removed Callback references