Some CRUFT removal, nuked iframe for future extensibility/reusability