Rearrange specs
delete unused specs