*remove wrapper class