[SYNC] Synchronize with core:

- remove obsolete variables, code stuff  and "nosubcat" option
  which was not implemented
- pep8 changes

Change-Id: I8e75a44afe1e4126d156b7d92900445da5b298d3