Cleaned up overlay

Change-Id: I2d7b904312f002eb81130bbc6655aed3b4364649