code tidy up, removed service interfaces