Removed statements and commented codes