removing further commented codes