Removed all DEBUG blocks