Cleaning up TODOS in client code