Type cleanups