removed debug ifdefs