Removed unnecessary SRP stuff