Clean up
Added boolean into data type
Nuke CSV again