Remove Unneeded Class