Cleanup
More cleanup, bridges seem to be working again