Cleanup for #2243
Cleanup for #2243

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