can you remove this TODO now?