More PlayerControl cleanup