Get rid of some unused code
Refactoring Schema a bit
Working on allowing a schema that ignores some columns