Removing un-needed flags