Cleans more thoroughly & clean bug identified.