Fully remove ICallback
Forgot this in the last commit
Merge branch 'master' into disk_cache