While block removed