Remove dependency of sunspot