Small services cleanup