GH-4201: Cleaned up some leftover junk I missed removing