Changing to layer system #3 (cleanup)