Is this still needed - not just used for debugging?