Cleanup in preperation for overhaul.