PLAT-534: removed obsolete and commented out code