Change schema, drop link tables
style changes