remove some dead code and unregister unused content observer

-Vanir

Change-Id: I95c65c46d7080ef8babf16c062c32e2c11f91e51