Remove some dead code

Simplify state by deleting unused & always true stuff

Test: builds
Change-Id: Idf679aff5e809e567dac21a127cb9d6ace894f0e
5 files changed