Removed dead code
Option handling
Version shift and license information