cleanup - removing injection of unused services