Removed cruft
Minor changes