Added dir removal for generated files