removed unused services
selection menu fixes