Clean up, enable and updates