first pass
remove extra