* Remove unused vars
* Major reorganization