Drop location added

mutated pieces fixed
unused code removed