KFSPTS-3659 Cleanup