Cleaning up PC and other code