[issue #86] [Updated] deletes reduntant code