Removing duplicate info and clean up