This class isn't needed here?