Remove closure for 5.2 and 5.3 support