Got rid of duplicate class
Got rid of duplicate class