This class is not required, will be removed