Updated removal check order

Was preventing removal of flags