Improve remote-module setup when remote are already setup