Remove more stuff
Use separate var and don't make apt-file update until necessary