remove and rename a few layers