Remove commented out code
Organise imports
Unused public static
Regenerated
Also package.html
Regenerated
Regenerated
Handle upload better
Regenerated
Tidy up