Some cleaning up before I get back to PCC coding.