Removed some fixed TOOD:s.