Major front-end cleanup