Some cleanup operation and removed some stale divs.