better spec, remove old code that was added during merge resolution