General cleanup; why two files, when you could only have one?