Spine: cleanup, remove old code