Removed cruft