Remove more code dupe. Make client-side only code dedicated server proof