Cleaning up pitch stuff