Cleanup and prepare for Frodo/Gotham