Remove before and move into before all