Feature #212: more cleanup