removed all disabled code in the transition to a service-less app