Removed unused codes
Changes