Removed function/builder globals