More cleanup - also copying settings.bundle