rm unused code, some of it referring to removed service
rm unused code.
Some of it referring to the removed service. We keep the cond test
Edited by Christos Anastopoulos
rm unused code.
Some of it referring to the removed service. We keep the cond test