Cleaned up connection bootstrapping

Still sucks.