Clean up + configuration update