remove solid/non-solid distinction