FIX - removal of closure compiler