Merge "Cleanup from previous refactor CL"