Removing these classes as they are being replaced.