Clean up and updates