overlay: cleanup + optimize