Removed the common SCRCH and found some uncalled code along the way.