TODOs cleanup

Change-Id: I0884dcdda65b17e7eea9ee46569bcb9dab1d7e08