cleaned up spring configuration files and removed unused declarations