Reenable experimental rebuilt of method closure. Removes unused dead code