[#3028] Removed dead code