Cleaned up worldserver includes a bit