Clean up non-use Code
Fix Conflict