cleaning up more complex files