Disable DEBUG in this branch for now