removed some of unnecessary options