Removing useless overlay + some rework