XD-1660: Remove unnecessary code