PLFCLD-53 cleanup