Cleanups for Editor Settings