remove copy/pasted code from polar/simple code