removed unused properties and methods
add new services
fix namespaces