Remove refs to options and args