Remove some overlay stuff

Change-Id: I9be46804d5f5e36deb34a66751061f3b734356a4