frontend & stats cleanup