Revert 1b9026c..0b40047

This rolls back to commit 1b9026cc96f9abbc0f7948ea44fe3010ec8675d5.
no polar cells with elastic constraint
Revert 0b40047..b79f33e

This rolls back to commit 0b400477a53965957aec98887acb571179a80fa9.
no polar cells + change energe