Remove some unused class