Remove blocking / reduntant parts for B2G