Extract addressing mode helpers
Remove old debugging code