Remove extensions workaround

At the time there was a bug that did not allow the extension to be direcly in the given clause in some situation. This has benn fixed and now we can implement them directly.

Author: nicolasstucki