Several changes

Updated Spring-framework and Spring-batch version. Removed several
classes that are not used anymore.