clean up and update to polymer 5.1