Cleand out a bunch of old code