Delete some TODO