rm unused class
use internal store if external is not available