removed duplicated methods
remove deprecated code
fixed add users and contacts