Removes redundant class calls