County adopts plan to wrap up work on controversial rules