Tidy and remove some systemd journal includes