Sorted out the ordering of my DB queries - removed some of my schema definitions