Removed uneccesary Polymer stuff