Remove todo
More fishiness