Only use two layers and cleanup