removing the last remaning apply() calls
3 files changed