Remove superfluous todos