remove BETA and DEBUG ifdefs