cleanup as per #6