remove global functions
rebuild with #254