General cleanup

Removed flags that are non operational, packages that are gone, etc

Change-Id: I0141721175eadb4368edc1bb8f89ef42806dac97