Removed debug code (again)