Moved Springs to not extend p2 Springs as they break when added to the p2.World. Springs and spring removal now working properly (#1134)