This TODO is pretty useless now :smile: