Shouldn't this class be removed?