widget cleanups