Cleanup for #2363
Cleanup for #2363

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