Removing overlays, moving changes into setup script