Remove test codes
Merge Conflict Resolved