Removed DEBUG code