removed needless  security measures