Cleanup solution to bridge a bit.