Cleanup settings manipulation