remove commented code and rename cache