remove non-spot instancetypes, remove some test code