Added remove host option