Fixed not being able to remove the last companion