Remove unnecessary, unused class