Rmoved reduntant code