fix how remove worked, so it also removed entityset not in use, and on select widget