cleanup and Spring property settings