Meta updates, cleanup