Unused classes deleted. Spring beans added.