Mostly finished with Schema cleanup