refactor - rm old class