Specs cleanup