Delete unused code

No functional changes
Explain extra Layout in comment