Clean up metadata code