Systemd cleanups.

Submitted by:	lemenkov
Issue #:	14