Removed cruft. Added sketchy bits