removed some unneeded options