KFSPTS-3483 Cleanup code