#25 --- cleaning up spring config