Merge "remove unused private fields and unnecessary TODOs"