Update: Schema fixes & removed unnecessary migrations
