Removed duplicate file
Additional file and reference cleanup