Both services working + cleanup