remove circular dependency from papillon