Refactor to use spring. Remove files committed in error