Removed non-existant callback
Small tweaks