more front-end clean-up