Remove old/deprecated services and files. Includes some minor clean up,
including file headers.

Change-Id: Ia38545ebe3b967281f45b7cc71735116e2d4ef21