Remove hub and screen aliases