todos for removing a bug