removed not needed [OPTIONS] and remove poor messages like 'Not enough arguments'