remove unnecessary code
removed redundant code even further