conventions cleanup