Cleaning up the pak-* references