Changed drop table order to fix some issues