Removed d2c code and unused services (bug 1005995)