Cleanup for #2362
Cleanup for #2362

zhoujia123/hapi,Binarytales/hapi,ldesplat/hapi,deepakshrma/hapi,vertiman/hapi,HugoRLopes/hapi,Binarytales/hapi,HugoRLopes/hapi,wzrdtales/hapi,elnaz/hapi,elnaz/hapi,jrmce/hapi,youprofit/hapi,wzrdtales/hapi,evdevgit/hapi,jefflembeck/hapi,DJMcK/hapi,deepakshrma/hapi,pandeysoni/hapi,youprofit/hapi,rodfernandez/hapi,DJMcK/hapi,bells17/hapi,credosam/hapi,udhayam/hapi,udhayam/hapi,shalomabitan/hapi,zhoujia123/hapi,bbondy/hapi,shalomabitan/hapi,StudyForFun/hapi,elnaz/hapi,SimonLab/hapi,vertiman/hapi,toboid/hapi,aulvi/hapi,SimonLab/hapi,danielb2/hapi,pandeysoni/hapi,toboid/hapi,rodfernandez/hapi,analytically/hapi,hulbert/hapi,ldesplat/hapi,jefflembeck/hapi,analytically/hapi,rmoorman/hapi,bells17/hapi,Eric013/hapi,ryanmurakami/hapi,StudyForFun/hapi,aulvi/hapi,cesarmarinhorj/hapi,wookiehangover/hapi,cesarmarinhorj/hapi,rmoorman/hapi,pandeysoni/hapi,ClaudeHarry/hapi,Marsup/hapi,julianduque/hapi,papimomi/hapi,bbondy/hapi,ClaudeHarry/hapi,papimomi/hapi,Marsup/hapi,Eric013/hapi,hulbert/hapi,danielb2/hapi,camerow/hapi,camerow/hapi,evdevgit/hapi,jrmce/hapi,wookiehangover/hapi,ryanmurakami/hapi,credosam/hapi,julianduque/hapi