BPC-145: removed old code