Add build task usage info
Remove unused fn
Use event data for more efficiency