RESTWS-206: Cleaned up spring context