Fix code smell
Cleanup unused uses
Fix Exception to correct code
Adjustments for PHPParser 1.0.x
More Cleanup