Tidy up of Discounter