Layout consistency
Removed unused code