Remove unsafe calls