Got rid of a rather useless @todo