Mass rebuild cleanup