Updated schema.rb to remove trails that left behind by merge.