Merge "Clean up code"