Removed TODOs which are more comments on reason for not supporting cases