Remove remaining currTarget references