:lipstick: some post-chaos cleanup