Cleanup, and include the extensions