Updated Issue #373: Removed system/upload, minor improved gleez/upload