schema clean up