Removed old code
Made flags consistent