remove unnecessary breaking calls