Removing TODOs which are not necessary