Attempt to remove debug...