Further cleaning up for files