removed a few extra unneeded flags