Partial code cleanup - Services