Code clean up. Removal of other register links.