Removing commons-cli dependency