Eliminated yargs dependency