before removing classes
Final delivery version