Deactivate old code that doesn't compile
Refactor validation code for Servant assignment