Removed some columns, modified build to a more simplified version