This class seems to be unused. Can it be removed?