BLOCK: do not CREATE_TRACE_POINTS for BLOCK code.
Revert USB CABLE Hack, it's not working as needed.