Clean up code

Removed an unnecessary instantiation, deleted an unused import, etc.
Simplify random upgrade drop calculations

There doesn't seem to be a particular advantage to using Random here. If
Random must be used, a universal Random object would suffice.
Merge pull request #6 from guoguo12/master

Simplify upgrade drop code