Deleted a bunch of cruft from the old master