License fix, redundant code issues fix.
Orbwalker fix.
Merge pull request #131 from WorstPing/master

License fix, redundant code issues fix.