removed unsued methods and objects, added user services