Some remove server stuff and a few fixes.