Removed unneeded cruft