Livery cleanup