Remove short formation directives

Fixes #24