Issuse #4608: Reducing unnecessary files