24557 - refactoring

- using the api for data
- tightened the update functions in the controllers
24557 - more refactoring

- controller code drastically reduced and code re-use introduced
24577 - cleaned up service(s), added a little logging
24577 - removed the test service