Removed useless cruft