Removing debug code, reordering db migrate