Issue#39 removed schema