Cleanup of lobby markup