removed commented codes