Merge "Continuing register cleanup"