cleaned up duplicates and scratch