Removed cruft, etc.