More cleanup, including better override management