More spring conversion.
Cleaned up some unneeded classes.