Major refactoring

* Removed JsonConfig and ZeroBanner code

Change-Id: Ie568eb1d248e78b56d3975081a94f3a44dab8525