PTFM-13795 session conf dir cleanup

@psung please review. Comments on the correctness of this?