Removed spring stuff