dev removed commented codes