More front end cleanup