Remove unnecessary overlays for Chaos

Change-Id: I3891c069165ecf198109e8f823d343c0fd976a4a