Refactor - use remote bash