Overlay cleanup

Change-Id: I395d16ac26f2d5027ddd805e447c1c5270d8f592
Signed-off-by: iceandfire <arhamjamal@gmail.com>