Removed the two new classes