Remove unneeded class