Remove unnecessary flag and change default params