More cleanup of Schema class