removed some hardcoded flags