Clean FileCsvController and TODOs