Merge "Cleanup: rm TODO, fix license header." into stable/brahmaputra