editor draw cleanups