cleaning
removed unneeded flags