Removed a ton of duplicated overlays

Change-Id: I174c97a10672d54fee2d3875f784667b75ec9fd1