Some cleanup to layout support removing commented out code.