Optimize callbacks
Remove old specs