Preparatory cleanup for future overhaul