LOW / Prevent NPE that can be due to the presence of FIB Reference
components
LOW / remove some useless code.