Clean up layers a bit