Removed cruft, fixed broken merge.