Remove some unused imports
Initial automated refactoring
Split the RegistrationClient into registration and parking