Update specs to remove cleanup routine