[#2665] Removed sample listener