import class extensions cleanup