removed dependency to old code