Cleanup unneeded filed