Close some TODO