cleaning up to include all files