Removing SPN to the next version