Clear up and re-try with Polymer