Remove commons-cli dependency