Removed unused code.
Corrected some generics
Migrated CSVImportAppTest to @Resource annotations