removed unused codes