Rejiggered Service Host Names and cleaned up old code