MOAR REFACTOR
Remove now-redundant spec