Cleanup of data keywords