removed remaining spring stuff and bugfix