remove temp testing code
back out CAC timing changes for a later push and pull request