Removed debug messages outside the DEBUG scope.