some cleanup, adding more schemas