Removed test scripts. Some option formatting.
Removed more useless files.
Option formatting.
Merge remote-tracking branch 'origin'