Remove extra 1.2 spec files. Tidy up