more cleanup
more cleanup
more cleanup
Merge branch 'Rel18-One' of https://github.com/billy1arm/MNG into Rel18-One