Removed TODOs

Removed implement csv and auto gen catch block