Frontend junk cleanup