Merge fix...
Remove unnecessary junk..