Remove unused code
Ensures existence; fix
facepalm
Fix specs