cleanup and redundant file removal