Deleting a bunch of commented out garbage that I didn't get to address in the last rushed PR.