some clean up of remaining code in the package as discussed in ATR-24928. All required clean up made plus a bit of clean up related to a python file.