WUI: improved gc (ref: #38)