Boyscout cleanup