[frontend] Some more cleanup.