Removed static variables copying from builder code.