Merge "Remove deprecated register keyword"