One less TODO