editmode cleanups