House cleaning to source files