file locations cleanup