Clean up
Update ubuntu:apt config