More disasm fixes, remove old code