Cleanup for #1863
Cleanup for #1863

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