Remove existing non working services

Remove existing non working services