Blergh. Yet another cleanup