labs update, cleanup