display: a cleanup and removal of old code