Updated todos, removed deliberately broken code