Cleaning up how layers are done