removed remnants from earlier attempt at control flow