Remove useless Concrete suffixes