Removed unused codes