Removed debug code...