Fixing route/bridge table APIs and reverting some unintentional commits