Conventions; cruft cleanout