Small updates, removed old csv code that wasn't in use.