Removed overload of basic code and updates to go from Hibernate to
Spring config