Remove unused stufff
Merge branch 'callbacks'