Merge "Clean up code." into tm-dev