Cleanup for #1931
Cleanup for #1931

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