Fix: Remove unused services