Delete the basics except for simple assertions; cleanup remaining specs