first pass cleaning: unused / duplicated stuff