Remove unused code, add overlay