Revert "We clean a bit up our features"

This reverts commit 0b8794efac425a6beefbcb0472b0a1c039b8dbad.