More realmserver tidy up