some cleanup, removed duplicates