Added remove to non-persistent keys.