Move to 100 percent width, remove old width code