EAGLESIX-2714: removed extra code