Remove dependency to security-server