Cleanup and stay minimalist