less cargo-cult garbage

more sanity