Remove time sampling and move wg two levels down