General source file cleanup