removed some defaults