OPF remove blank text and cleanup