Remove todo - that's what github issues are for