do some cleanup in derivatives section