(master) more cleanup