Fix to @spring_version, cleanup