More front-end cleanup.