Clean up DB schema