Cleaning up of source files