Cleanups - resolution changing code