removed unused classes not removed during merge