ERT-530: Removed outcommented code