clean up xml
simplify user service
integration test working