Removing confusing properties, relying on command line opts.