Moved quiz and performed final cleanup