removed extraneous unsafes