Update rebuild cleanup functions