Fixed leftover variabe not used any more