Cleanup of unnecessary field