Moar TODOs, some other already done removed