Eliminated a lot of client-only code