Remove unnecessary metadata code