Cleanup inhibitor and reset arc code a bit