Re: [PATCH 2/2] Remove hardcoded c and p states