Remove duplicate class definitions