Remove unused code

Remove left over overlay automagic code