Cleaning up display code cruft.