removed unused commented codes