Clean up specs a bit
Remove unused files and fix up some more specs.