LPS-35075 remove code which is not needed anymore
LPS-35075 source formatting
LPS-35075 keep just one instance