removed uncomment code