Clean up data attributed handlers