Some cleanup in preparation to doing some work.