Clean up control metadata