Remove godfather dependency