I think Butler should just clear itself out when the player changes.