[PATCH 2/7] removal of commented/obsolete items for base services