Cleaning up service links feature and removing hyves icon refs #1546