more cleanup for Lars