remove debug code, for GENERIC build