Oops, only do that for certain allocations
Clean up some legacy /etc stuff