Get specs working
Remove most deprecations