in case of null, remove it