delete_custom_data Funktion
clean up
fixed merge conflict