Remove closure usage where not 5.3 compatible