* misc cleanup