a lot of cleanup in default sql and schemas