Add host/device proxies to cleanup