get rid of some admits; other small cleanups