Removed unneccesary unsafe blocks