Merge "Clean up register line"