Replace old code constructs
Spark is an old project. As a result, some of the code uses language constructs that can be improved upon. This will primarily result in cleaner code, which reduces complexity
Functional changes should not be introduced by this refactoring.
This was pretty much a placeholder issue for the Smack 4 migration, which has been completed. Issue can be closed.