Superficial cleanup of DebugVC and related classes