API cleanup (delete + rename)