Get rid of that unit spec, too tied to implementation