Update readme and remove todos