remove old class structure