OP-421 Refactored legacy services
Removed groovy references, removed BeanUtils, reduced warnings, made models immuatble