Removed temporary DEBUG option