Clean up and quickstart