Cleanup and small demo