Removed nonstandard command line stuff