Fix UDF deletion and delete fields that should be gone