DEBUG messages removed