cleaned up duplicates etc