removed unwanted and commented codes