Removed some more ploymer stuff.