MDL-23068 removing obsolete $result and removing empty upgrade files that would be probably never used at all + minor cleanup/fixing