Drop some obsolete stuff

Change-Id: Icc6bf58c295591347a3079d2a5312e1904e57060