Try clean up the instruction collection stuff