removed all spring stuff