more l=clean up