Prepare UHCI legacy handler for debug; dead code removal