Removal of question, rotisserie for upgrade.
More q, r cleanup.
Deprecation error cleanup.