cleanup - remove unused metadata fields