Trimming some old code off of the fork.