further removal + refactoring of code away from spring