Merge "Remove CSV support"