Change services + start clean up the old GUI unused code