Remove time consuming step