Actually this class shouldn't even exist, will remove it from master.