Pruned TODO list [ci skip]