More services & small clean ups

Don't add empty destructors.