just some misc cleanup