Cleanup of obsolete fiels