Merge "Cleanup related to files removed in Phone refactor."