fix some problems and dropping schema