Remove flight hacks to work with standalone and AMD