Remove stuff from TODO list that does not belong there...