more cleanup requested by @ceeram