cleaned up spring configuration