[FOLD] Remove unused requires and other misc cleanups