Refactor removeRemote to be consistent parameter is remote