removed comment and code that are not necessary or used