Simplify a few things in preparation of basic bungeecord support