Post @jezdez cleanup