Removed all the TODO-s.