Merge branch 'tw_cleanups'